gitweb / test / file with spaceson commit rebase: allow --skip to work with --merge (d5e673b)
   1This
   2filename
   3contains
   4spaces.